fix coflicts in routes
merge