Fixes to merges