introduce conflicts
test merged