create company redicrect
merge conflict solved