deleted .svn directory
fixed README conflict
trying to remove .svn directory