cleaned up mergeo