Fixed up remnants of layout merge conflict