From 420672a7690d1ccaf4fb070812bc9abbc7c11f6f Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Thu, 29 Mar 2018 09:26:05 -0700
Subject: [PATCH 1/2] fix-qml-confict

---
 interface/resources/qml/{AudioScope.qml => AudioScopeUI.qml} | 1 +
 scripts/developer/utilities/audio/audioScope.js              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename interface/resources/qml/{AudioScope.qml => AudioScopeUI.qml} (99%)

diff --git a/interface/resources/qml/AudioScope.qml b/interface/resources/qml/AudioScopeUI.qml
similarity index 99%
rename from interface/resources/qml/AudioScope.qml
rename to interface/resources/qml/AudioScopeUI.qml
index aa181dbf8d..b009c249bc 100644
--- a/interface/resources/qml/AudioScope.qml
+++ b/interface/resources/qml/AudioScopeUI.qml
@@ -12,6 +12,7 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import "styles-uit"
 import "controls-uit" as HifiControlsUit
+import "." as HifiRoot
 
 Item {
     id: root
diff --git a/scripts/developer/utilities/audio/audioScope.js b/scripts/developer/utilities/audio/audioScope.js
index 00c9e4b725..63cbf0a6e2 100644
--- a/scripts/developer/utilities/audio/audioScope.js
+++ b/scripts/developer/utilities/audio/audioScope.js
@@ -1,4 +1,4 @@
-var qml = Script.resourcesPath() + '/qml/AudioScope.qml';
+var qml = Script.resourcesPath() + '/qml/AudioScopeUI.qml';
 var window = new OverlayWindow({
     title: 'Audio Scope',
     source: qml,
@@ -14,4 +14,4 @@ window.closed.connect(function () {
 	AudioScope.setServerEcho(false);
 	AudioScope.selectAudioScopeFiveFrames();
 	Script.stop(); 
-});
\ No newline at end of file
+});

From f7a081c9ecf6180c848697041bf519a033da08cb Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Thu, 29 Mar 2018 09:29:01 -0700
Subject: [PATCH 2/2] minimize diff

---
 interface/resources/qml/AudioScopeUI.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/interface/resources/qml/AudioScopeUI.qml b/interface/resources/qml/AudioScopeUI.qml
index b009c249bc..aa181dbf8d 100644
--- a/interface/resources/qml/AudioScopeUI.qml
+++ b/interface/resources/qml/AudioScopeUI.qml
@@ -12,7 +12,6 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import "styles-uit"
 import "controls-uit" as HifiControlsUit
-import "." as HifiRoot
 
 Item {
     id: root