fix conflict errors.