Add unit test for default conflict resolver