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

Clean up your tabs in this file, a bunch of places.