merge issues with gemfile dot lock