Git Resolve Conflicts Command Line