bug commitAndMerge