reset git
merged
merged
merged changeS