Fixed merge errors from previous commit.