Fixed Merge Conflict in boinc.py