made code more Pep8 compliant
fixed conflicts