remove merge marker
fix antlr download url
build fixes
fix missing stuff from metric form