some more fixes for merging