user2 commit conflict test
kdiff test