Fixes a merge bug.