Fixing couple of syntax errors in merge