change to upper
merge ok