final edit before merge