Fix some merge bugs.