Fixed some merge errors I introduced.