small changes
fixed conflicts with code