Conflict Containment

This site is deploying correctly.