fix evidence-node shape
fix conflict