add-sync1: Fixed few PEP8 and merge conflicts