The following untracked working tree files would be overwritten by merge, fix

git fetch --all
git reset --hard origin/{your branch name}

This solved the problem