fixed conflicts
fixed dumbness