conflict change
conflict resolve?
replace with original one