Removed some unecessary files
fixed conficts