delete jqueyui files
merge conflict