commit2, no conflict