gitignoring pyc
fixing merge