Conflicts resolved
Change in Json and Refresh Popup on next/previous