diff --git a/session.go b/session.go
index e65b9c9f..a8824e28 100644
--- a/session.go
+++ b/session.go
@@ -1540,10 +1540,7 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
 				sliceValue.SetMapIndex(reflect.ValueOf(key), reflect.Indirect(reflect.ValueOf(newValue.Interface())))
 			}
 		}
-<<<<<<< HEAD
 
-=======
->>>>>>> parent of 24f47dd... Add FindMap
 	}
 	return nil
 }