Error when registering custom functions from Gist

[samfeder]

Bug Report

• Host: Excel
• OS: Mac

Expected behavior:

When I register functions, it should add said functions to excel

Actual behavior:

"An unexpected error has ocurred"

Error:
{
    "message": "There was an internal error while processing the request.",
    "name": "RichApi.Error",
    "code": "GeneralException",
    "traceMessages": [],
    "innerError": null,
    "debugInfo": {
        "code": "GeneralException",
        "message": "There was an internal error while processing the request.",
        "errorLocation": "CustomFunctionManager.status",
        "statement": "v.load([\"status\"]);",
        "surroundingStatements": [
            "var workbook = context.workbook;",
            "var v = Microsoft.ExcelServices.CustomFunctionManager.newObject();",
            "// >>>>>",
            "v.load([\"status\"]);",
            "// <<<<<"
        ],
        "fullStatements": [
            "Please enable config.extendedErrorLogging to see full statements."
        ]
    },
    "httpStatusCode": 500,
    "line": 26,
    "column": 254807,
    "sourceURL": "https://appsforoffice.microsoft.com/lib/beta/hosted/excel-mac-16.00.js",
    "stack": "n@https://appsforoffice.microsoft.com/lib/beta/hosted/excel-mac-16.00.js:26:254807\n@https://appsforoffice.microsoft.com/lib/beta/hosted/excel-mac-16.00.js:26:319155\n@https://appsforoffice.microsoft.com/lib/beta/hosted/excel-mac-16.00.js:26:317236\npromiseReactionJob@[native code]"
}

Looks like some "<<<<<" and ">>>>>" from a merge conflict are in production code?

Steps to Reproduce:

1. Sign in via Github to see Gists
2. Pull in gist, it should show in "My Snippets" under "My shared gists on GitHub"
3. Click shared gist, hit "Register" on top of pane.

Failure Logs:

Shared above

Screenshot: