wip
add basic conflicts test