Conflict resolution implemented

Will print in console but not actually change the play field