Bit more merges.

Curse you unity specific files!  Always so hard to merge.