comitting before merge