diff --git a/.npmignore b/.npmignore
index 56926a9..bb74c51 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,6 +1,7 @@
 .build.yarnrc.yml
 .drone.yml
 .eslintrc*
+.npmrc
 .prettierrc*
 .yarnrc.yml
 babel.config.*
diff --git a/src/dao/auth/readOneByRecord.ts b/src/dao/auth/readOneByRecord.ts
index ba5649b..2674fa0 100644
--- a/src/dao/auth/readOneByRecord.ts
+++ b/src/dao/auth/readOneByRecord.ts
@@ -1,5 +1,9 @@
 import { Types } from 'mongoose';
 
+<<<<<<<< HEAD:src/dao/auth/readOneByRecord.ts
 import { Auth } from '../../model/auth';
+========
+import { Auth } from '../model/auth';
+>>>>>>>> main:src/dao/readOneByRecord.ts
 
 export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record });
diff --git a/src/dao/auth/readOneByUsername.ts b/src/dao/auth/readOneByUsername.ts
index 380f05b..fdff465 100644
--- a/src/dao/auth/readOneByUsername.ts
+++ b/src/dao/auth/readOneByUsername.ts
@@ -1,3 +1,7 @@
+<<<<<<<< HEAD:src/dao/auth/readOneByUsername.ts
 import { Auth } from '../../model/auth';
+========
+import { Auth } from '../model/auth';
+>>>>>>>> main:src/dao/readOneByUsername.ts
 
 export const readOneByUsername = async (username: string) => Auth.findOne({ username });