working on authorize
fix conflict
merge company index