fixes to merging