resolve merge conflict in SiftsClientTest