merge

diff --cc test/repl/aggregator-conflict.expect
index 3cff8f96725ae49654b5480914e13b97db0406b6,7c6de424d8144ba9ad0283322ef5fa5da3680b37..344e0e73d1958dc92e01e71af951ab8f70ae1200
--- 1/test/repl/aggregator-conflict.expect
--- 2/test/repl/aggregator-conflict.expect
+++ b/test/repl/aggregator-conflict.expect
@@@ -1,11 -1,9 +1,11 @@@
 -> > =============
 -a => 1.
 -> DynaCompilerError:
 -FATAL: Encountered error in input program:
 - Conflicting aggregators; rule /home/timv/.dyna/tmp/25930/966093dc38b755a6f17b02774b5c656931163a3a.dyna:5:1-/home/timv/.dyna/tmp/25930/966093dc38b755a6f17b02774b5c656931163a3a.dyna:5:3
 +:- :- =============
 +a := 1
 +:- DynaCompilerError:
 +Encountered error in input program:
-  Conflicting aggregators; rule /home/timv/.dyna/tmp/31141/966093dc38b755a6f17b02774b5c656931163a3a.dyna:5:1-/home/timv/.dyna/tmp/31141/966093dc38b755a6f17b02774b5c656931163a3a.dyna:5:3
++ Conflicting aggregators; rule /home/timv/.dyna/tmp/27197/966093dc38b755a6f17b02774b5c656931163a3a.dyna:5:1-/home/timv/.dyna/tmp/27197/966093dc38b755a6f17b02774b5c656931163a3a.dyna:5:3
   uses '|=' for a/0 but I had been lead to expect '+='.
 +Everything was syntactically valid, but we could not
 +see it through.
  
  > new rule(s) were not added to program.