Installation of software-properties-common needs to happen before ppa\'s can be added.
Minor conflict resolution.