final push
fixed conflicts