resolved merge conflict between svn and github

the only way I was able to resolve it was to allow the conflict to affect the file for some commits and mess it up with the conflicts. This commit reverts the file back to the desired state.