Fix remerge