Fixed parse error after wrong merge conflict