fixing conflict
adjusting routes for api