Upgrading Rails version
merged conflicts
removed old gems