Correct syntax error introduced when trying to merge branch with master