more conflicts - update pfs to swift 1.7.5