Fixed an error caused by a merge commit.