make Gemfile.lock ignore & let database.yml to example
merge conflict