- added article on useful Subversion commands.
- added section on resolving merge conflicts