1080i/Includes_Widget2.xml merge fix