include the infrastructure for inserting padding cells when there's a relay-recognized conflict, but it does not work currently. svn:r958