created database
resolved duplicate files and fixed merge error in routes file