removing conflicting files, will be added later