Removing conflicting files