Merged files

resolved conflicts