fixed typo
fixed conflicts