fixing merge comments