Fix #283 - Refactor rsync to only use absolute paths

`addNonConflicted()`