initial
init conflict resolution