resolve conflict

diff --cc src/edu/berkeley/fleet/assembler/Parser.java
index 39deda3,39deda3..e145019
--- 1/src/edu/berkeley/fleet/assembler/Parser.java
--- 2/src/edu/berkeley/fleet/assembler/Parser.java
+++ b/src/edu/berkeley/fleet/assembler/Parser.java
@@@ -47,10 -47,10 +47,6 @@@ public class Parser 
          return grammar;
      }
  
--    Tree<String> parse(Reader r) throws Exception {
--        return new CharParser(getGrammar()).parse(new CharInput(r)).expand1();
--    }
--
      public void parse(Reader r, OutputStream out) throws Exception {
  
          // this needs to be "code bag zero"