Done intellectual property and company background
Fixed merge conflicts