some fixes
Merge weirdness