updated some files
merge conflict