removed parts
added_new_file
Merge branch 'branch1'