remove the rails4 gem
fix merge conflict. Gemfile.lock should be in version control for apps.