commit merge branch