committing before merge