Bugfix on Gemfile

Some Git conflict markup was prevent the project from building