review changes before merge