fix up front-end for defendants addresses
fix conflict