test
resolve the conflict