Remove merge conflicts from src/testlink/testlinkapi.py