made the popups persistent
resolved conflicts