new changes
resolved conflicts