applied pep8 formatting, Fixed compile time errors
merged conflicts