fix recently introduced conflict handling bug

I somehow failed to update the actual call to create_and_lock_xform when I
refactored to add an explicit domain argument

this was caught by receiverwrapper tests in commcarehq
Merge pull request #110 from dimagi/fix-conflict-handling

fix recently introduced conflict handling bug