New guides clean merge