keeping good changes
merged?