diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index e64557b3..94778ae0 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -4528,7 +4528,7 @@ NDKS = [
 
 
 def handle_retree_error_on_windows(function, path, excinfo):
-    """Python can't remove a readonly file on Windows so chmod first"""
+    """Python can't remove a readonly file on Windows so chmod first."""
     if function in (os.unlink, os.rmdir, os.remove) and excinfo[0] == PermissionError:
         os.chmod(path, stat.S_IWRITE)
         function(path)
diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 90b8b0e8..1baa1551 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -249,11 +249,7 @@ def get_lastbuild(builds):
 
 
 def check_update_check_data_url(app):
-<<<<<<< HEAD
-    """UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs"""
-=======
-    """UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs."""
->>>>>>> c380427b (rewrite docstrings to match numpy style guide)
+    """Updatecheckdata must have a valid HTTPS URL to protect checkupdates runs."""
     if app.UpdateCheckData and app.UpdateCheckMode == 'HTTP':
         urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
         for url in (urlcode, urlver):