empty document
just add
else
resolved conflict
Merge https://github.com/IF034Java/TmpGit