fix dublicates
rename member