Merge branch 'company_base'
edit b.txt