Fixed merge conflict
Merge branch 'master' of https://github.com/shindostrz/pop-up-archive
Manually reverted file to the master version