attempt to fix problem with merging