Fixed gm_exception and resolved some conflicts that were ignored