fix password conflicts