Updated Glib
Added Glib Update
REsolve conflicts