updated files
resolved conflicts