fix merge-errors in batch compiler & test
1 file changed