added function to load pop-up and close it when user clicks on button
function for pop-up and merge conflict fixed