fix error with merging