Fix Issue #3 - conflicted file copies

WIP on conflict logic