removed merge comments