prior to pulling from master
prior to pulling master
resolving merge conflicts