update commit merge