Remove unwanted merge comments