push to merge everything before resetting routes and controllers