commit before conflict
fixed conflicts