fix problems
fixed conflicts