Changes lost during merge