iadded stuffs
fixed conflicts