Merging concurrent changes, fixing messiness because of this