fixed typos
fixed conflicts