adding /:id route
correcting merge