first draft of conflict resolver