changed conflics
resolved conflicts