typo fix
fixed conflicts