massive update... FRIGE WORKS
fixed some stuff from conflict resolver