[Dj] Adding how to fix the "The following untracked working tree files would be overwritten by merge" error.