Fix #372 - Conflicted copies should not be generated if the client has a newer version of the file