minor: resolve README.md merge conflict

yulonglin · yulonglin · commit 4c16449f189c · 2021-09-07T16:01:26.000+01:00
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ## StyleGAN2-ADA &mdash; `pip install` version of Official PyTorch implementation
+=======
+## StyleGAN2-ADA -- `pip install` version of Official PyTorch implementation
+>>>>>>> a07e6ee150fe85c385182da18560d660bf782c7e
 
 I have modified the official PyTorch implementation so that you can `pip install` this repository as a dependency and reuse the classes and functions here.
 
