Add version undoing
Added company search
Fix conflct