Force git to overwrite local files on pull with theirs

git fetch --all
git reset --hard origin/master