God-guard merger

Summary