Subversioning a Unity project

There were a few conflicts when I committed my latest Unity C# code to our SVN, so I ended up with some extra versions of each of those conflicts, which looked distracting in my Unity Project panel!

So, I resolved them using the TortoiseSVN's mine resolution (as opposed to theirs) in the hope of getting rid of those files, but now I have one more of each (the mine files!).

Of course I can always choose to hide them in the Windows Explorer but how do I get back to a normal state of the Project panel without removing any files and specially the important meta files?