Resolved conflict using SVN