resolve conflict right-widget