Created explorer popup modal with options.
resolved merge conflicts.