diff --git a/README.md b/README.md
index 78d523e..ccc69fe 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # SAGNet: Structure-aware Generative Network for 3D-Shape Modeling
 by [Zhijie Wu](https://zhijiew94.github.io/), Xiang Wang, [Di Lin](https://vcc.tech/Di_Lin/), [Dani Lischinski](http://danix3d.droppages.com/), [Daniel Cohen-Or](http://www.math.tau.ac.il/~dcor/), [Hui Huang](https://vcc.tech/~huihuang)
 
@@ -156,3 +157,4 @@ year = {2019},
 
 ## License ##
 MIT License
+