minor clean up of a merge