Made it compile
Erp, conflit merge