changes lost in merge