another conflict test
resolve conflict