Update mob_branch.txt

resolved merge conflicts in mob_branch.txt