*: Sweep up new CONFLICTS_INSTALL mess

• Fix typos
• Fix overwritten master/slave variables

I'm assuming the entries are correct otherwise.

Reported by: portscan