Fix merge errors.