fix some merging mess