fix merge error in routes
pulling changes from master