fixed typeo
fixed conflicts