diff --git a/安装.md b/安装.md
index 1e8bd69..4206570 100644
--- a/安装.md
+++ b/安装.md
@@ -30,11 +30,7 @@ dotnet add package FreeSql
 | FreeSql.Extensions.JsonMap | NETStandard2.0、net45、net40 | Json 序列化扩展包 |
 | FreeSql.Extensions.Linq | NETStandard2.0、net45、net40 | LinqToSql IQueryable 扩展包 |
 | FreeSql.Extensions.BaseEntity | NETStandard2.0 | |
-<<<<<<< HEAD
-| FreeSql.Extensions.Generator | NETCoreapp3.1 | 从数据库生成实体类，[生成器是如何实现的？](https://www.cnblogs.com/igeekfan/p/freesql-generator.html) |
-=======
 | FreeSql.Generator | NETCoreapp3.1 | 从数据库生成实体类，[生成器是如何实现的？](https://www.cnblogs.com/igeekfan/p/freesql-generator.html) |
->>>>>>> 75a3e6866345cc3bbd3a53e7eef8976e3fab64b3
 
 ## 学习指南