solved some svn merge issues from the past