front-end beginning
merge conflicts in routes resolved