gm and happy merge