Conflicts are usually caused by the fact that both the local and main SVN servers have modified the same place.

The solution is to delete the conflicting files locally, and then update them locally from SVN again. Then you can modify the commit again and it should be fine.

So when working with SVN, you must develop the habit of updating and then submitting. I hope this helps.