Changed supervisor on nodemon. Deleted result of merge conflict