Fix some merge problems.