removing conficting files