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

Yeah I think its coz I nested it in another describe block that github shows it as a change in position