auto save
resolved conflicts