init
init2
conflict resolution