More cleaning up of conflicted merge.