changeges local values
resolved conflicts