Git Resolve Conflict Using Head