Fix #155 - Integration tests for conflicted copy syncing