removed conflict line, removed unnecessaryjumbtron container