remove weird merge comments