another conflict test
merged