fix last (hopefully) of the merge issues