Remove commit conflict