fix bugs
fixed conflicts