Fix broken page after mege conflict
Merge pull request #9 from dragos-dumi/master

Fix broken page after mege conflict