Add some error handling if the merge fails so we don't mark it as complete
Merge branch 'master' of https://github.com/tlbdk/SQLServerCDCSync