take out of  folder created durring git merge from svn