test commit conflict
test manage the conflict