removed echo in $valid
merged conflicts