Issue3

WIP on conflict logic