Fix pylint errors

Removed unused import and removed merge conflict remainder.