comments before merge