changes before merge