Undo uniqe for company
Resolved conflicts