fixes a merge problem