resolve conflict when username is git