Went back to mergepath diagrams with guides