updated UIPicker
resolved conflict