new conflict resolver draft