Cleanup sync test suite
Fix access to conflict action when resolution attribute is set (fixes #504)
Merge pull request #505 from galfert/resolve_conflicts

Fix access to conflict action when resolution attribute is set