getting rid of conflicting files