edit controllers, rb files, attributes, routes
fixed merge