ThirdActivity was created in branch1
FourthActivity was created in master
Resolved conflict in merge
Some changes