Manually fix merge problems again.