Replace image lost in merge conflict