Trying to remove merge comments

Master automatically added these