Revert "Fixed merging conflicts"

This reverts commit b718458c7eb3b5dd4b60dd44540c66f743b2bdb3.
Revert "[unrelated] Suppress ModelMorf examples that fail to parse"

This reverts commit 748b7d24588725aacc33b6692bae5c82eee1e46b.
Brute force to fix a messy merge