fix unmerged commits.