Fix dap4 grammar problems
conflicts