commit edfarina changes

Resolve edfarina-uno conflict