like a value change
resolved conflicts