bugs with merging