Fix syntax from merge conflict