diff --git a/README.md b/README.md
index a87db79f7..40d9bb6d3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@ Build Status
 
 - Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=poco-1.8.0)](https://travis-ci.org/pocoproject/poco)
 - AppVeyor: [![Build status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae/branch/poco-1.8.0?svg=true)](https://ci.appveyor.com/project/obiltschnig/poco/branch/poco-1.8.0)
+- [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/370/badge)](https://bestpractices.coreinfrastructure.org/projects/370)
+
 
 ![alt text][logo]
 
@@ -35,6 +37,7 @@ Side-by-side use of Boost and POCO is a very common occurrence.
 
 When contributing to POCO, please adhere to our [guidelines](https://github.com/pocoproject/poco/blob/develop/CONTRIBUTING.md).
 
+
 All text file line endings in the repository must be Unix-style (LF).
 This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters).
 
diff --git a/libversion b/libversion
index 5ec86f24f..c5b431b6c 100644
--- a/libversion
+++ b/libversion
@@ -1,5 +1 @@
-<<<<<<< HEAD
-50
-=======
-49
->>>>>>> poco-1.7.9
+50
\ No newline at end of file