committing my local changes to approach and intro before a git pull
resolved all the conflicts