diff --git a/docs/source/new-project.rst b/docs/source/new-project.rst
index 9521febc..35834518 100644
--- a/docs/source/new-project.rst
+++ b/docs/source/new-project.rst
@@ -68,7 +68,5 @@ Then you could do rapid research by switching between these two and using the sa
 
 1. You're writing pure PyTorch... no unnecessary abstractions or new libraries to learn.
 2. You get free GPU and 16-bit support without writing any of that code in your model.
-<<<<<<< HEAD
 3. You also get early stopping, multi-gpu training, 16-bit and MUCH more without coding anything!
-3. You also get all of the capabilities below (without coding or testing yourself).
 
diff --git a/pytorch_lightning/trainer/trainer.py b/pytorch_lightning/trainer/trainer.py
index 27fcc7f2..a9e0ffb4 100644
--- a/pytorch_lightning/trainer/trainer.py
+++ b/pytorch_lightning/trainer/trainer.py
@@ -1,4 +1,3 @@
-import logging
 import os
 import sys
 import warnings
@@ -47,6 +46,8 @@ class Trainer(TrainerIOMixin,
               TrainerTrainLoopMixin,
               TrainerCallbackConfigMixin,
               ):
+    r"""Abstract base class used to build new callbacks.
+    """
 
     def __init__(
             self,