strcuture
conflict resolution