diff --git a/gnocchi/gendoc.py b/gnocchi/gendoc.py
index 846fd4716..b21b570f9 100644
--- a/gnocchi/gendoc.py
+++ b/gnocchi/gendoc.py
@@ -13,11 +13,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-<<<<<<< HEAD
-from __future__ import absolute_import
-=======
 
->>>>>>> fa7d13d4 (Remove the use of the future module)
 import io
 import json
 import os