Resolved conflict in svn repository.