Fix merge of commit.