Changed values
Resolved conflicts