Found some conflict indicators from
the last poorly resolved conflict.
Should be ok to merge now.