fixing merge conflicts - everyone needs to run git pull