Conflicted copy html files on my computer

Good evening, FileZillers...

I had computer glitch and now I have four of my website files on my computer that have copies of the original files names appended with the name of my computer followed by "conflicted copy 2013-03-02".html. They are newer that the server files. Should I simply rename them and overwrite the existing ones and then upload them to the server or is there some way special I should handle this?

Thanks for your time and patience!