Deleted textFile4.txt
master and apr15_1 branches are now diverging
Preparing to merge back into master
Merge branch 'apr15_1'
Setting up a merge conflict
Merge branch 'master' of github.com:bllanos/getting_started