resolving svn confilict

http://www.tutorialspoint.com/svn/svn_resolve_conflicts.htm