fixed typo
pep8'ed code
fixed conflict