Fix conquest once and for all