Git Resolve Conflict Command Line