remove unused import (merge confilct)
fix docstrings