resolve conflict
widgets
resolve conflict