updated files
solved merge conflicts