For me, the takeaway was to be careful what order you do installs and pulls to avoid merge conflicts. Nice write up.