fixed conflicts
small change