WarpContainment
Merge resolution