changes
adjusting the files and solving conflicts.