Fixes for merge comments