conceptual stuff
cinflict resolution