Fix errors that occurred when merging branches.