commit
fixed conflicts