fixes merge duplications
removes odd file