averaging conflict resolver