Conflict test

wip