Fix merge commit.