Solve the conflicts

.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  run-linters:
+    name: Run linters
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+
+      - name: Install Python dependencies
+        run: pip install pylint
+
+      - name: Run Pylint
+        run: find . -type f -name "*.py" | xargs pylint --rcfile=.pylintrc

.gitignore

@@ -23,8 +23,8 @@ __pycache__/
 
 # Sphinx documentation
 .doctrees/
-docs/*
-!docs/src
+#docs/*
+#!docs/src
 
 # Datasets
 data/*
@@ -56,4 +56,4 @@ test/*
 .keras
 
 dist/*
-singa_auto.egg-info/*
+singa_auto.egg-info/*