Fix #372 - Do not create conflicted copies if the client has a newer version of a file, and upstream that file

Hmm I used spaces....I think its coz of the shift in placement that github shows it like this