Model, routes, and controller adds
fixed merge conflict