updated Gemfile
you can now add your repos :smile:
fixed merge conflict