When I scroll the edit conflict page on a screen resolution of 1280 x 800, the info tour popups resize, which sometimes gives them a scrollbar. This shouldn't be the case.
Popup 1, view when the page hasn't been scrolled down.
Popup 1, the page has been scrolled down a bit, and the popup is resized.
Popup 2, the popup resized when the you scroll down the page