Merged fields fixes and fixed Readme
Change-Id: I9bfa4eb1a9f27998e73c9a4fdc749ba8eb90ceee
diff --git a/Readme.md b/Readme.md
index c3ab387..712c0e9 100644
--- a/Readme.md
+++ b/Readme.md
@@ -129,11 +129,7 @@
Annotation tools and models used in preparation of the test corpora are based on the following work:
-<<<<<<< HEAD
-Belica, Cyril (1994): A German Lemmatizer. Final Report MLAP93-21/WP2. Luxemburg.
-=======
Belica, Cyril (1994): *A German Lemmatizer*. MECOLB Final Report MLAP93-21/WP2. Luxemburg.
->>>>>>> 72430e3ed81e0a18c518fa400fb9f39fe350bf46
Bohnet, Bernd (2010): *Top accuracy and fast dependency parsing is not a contradiction*. In *Proceedings of COLING*, pp 89–97, Beijing, China.