Fix merge conflict arising because I started work without git pull
Fix merge conflict arising because I started work without git pull