.gitignore
Gemfile.lock
Merge conflict