Added company info
Resolved merge conflit