fixed conflicts
attempted to debug, no luck
fixed conflicts