auto-resolve alg for conflicts in Gemflile.lock and schema.rb