parse
conflict resolution