Conflict in LiveDevelopment.js

gistfile1.js

    /**
     * @private
     * DocumentManager currentDocumentChange event handler. 
     */
    function _onDocumentChange() {
        var doc = _getCurrentDocument();
        
        if (!doc) {
            return;
        }

        if (Inspector.connected()) {
            hideHighlight();
            
<<<<<<< HEAD
            // close the current session and begin a new session if the current
            // document changes to an HTML document that was not loaded yet
            var wasRequested = agents.network && agents.network.wasURLRequested(doc.url),
                isHTML = exports.config.experimental || _isHtmlFileExt(doc.extension);
            
            if (!wasRequested && isHTML) {
                // TODO (jasonsanjose): optimize this by reusing the same connection
                // no need to fully teardown.
                close().done(open);
            }
=======
            promise
                .fail(close)
                .done(function () {
                    if (_docIsOutOfSync(doc)) {
                        status = STATUS_OUT_OF_SYNC;
                    }
                    _setStatus(status);
                });
>>>>>>> adobe-randy/LiveHTML-icon
        }
    }

Here's the diff that changed this in master:

adobe/brackets@1f6b5aa#L3L1023