5.meyer30 got rid of merge comments