removed conflictive files