Fixed syntax errors after merge