comit before merge