add files to keep old popup and their javascript out of ressources file
merge conflicts