Fix syntax errors from the merge or the origin and master