Fix some mismerges.