Add *.pyc to gitignore
Delete conversion.pyc
Resolve merge conflict