Added 2nd div branch1-part2 to see what happens if edit then commit after merge back to master.
Added 2nd div branch1-part2 to see what happens if edit then commit after merge back to master.
Merge branch1