updating widget
updating conflicts