dropdown data people right
merge master conflict solved