add unite setting
conflict resolution