Resolved merge conflicts

repository now ignores .pyc files