New changes to front.js for login feature
save master changes to front.js file
conflict has been resolved and now your file is saved properly. Kindly take care in future