Commit resolved merge conflicts

Commit resolved merge conflicts from 0 A.D.