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

Same thing here, just pass the callback as the final arg.