Readding a change that had occurred due to a bad merge.