fix persona
merge