resolves shift/reduce errors. Accessor, Addressor modified
handles merge conflict