worked on new and create routes and controller actions
fixed merge comflict