Route for edit
Fix conflicts