Fixed syntax error originating from manual merge