removed old files
fixing conflicts