# Conflicts: # src/pages/Payment/MultiPaymentWindow.js # src/pages/Payment/index.js
# Conflicts: # src/routes/PublicUserRoutes.js
# Conflicts: # package-lock.json # yarn.lock