Fixes to merge
Fix merges