removed part2 from 2
Merged in 2
Merge remote-tracking branch 'origin/branch1'