fix conflict pretty-printing
expand stub GLR backend
avoid duplicate conflict branches