merge syntax errors fixed.