fixed conflicts after mergin upstream