sorts out merge conflict for #343

Fixes magistrate starting loc