(#27) - WIP - untested, basic conflict resolution