Fix #399 - don't track changes to conflicted copies in path to sync
Merge pull request #418 from humphd/issue399

Fix #399 - don't track changes to conflicted copies in path to sync