fixed invalid package.json
Fixing front server
Opps extra line!
fixed merge conflicts