Git Resolve Conflict Command