Fix #393 - Sync fails if the path provided is conflicted