tried to avoid merge conflicts

py/web_flask.py

@@ -1,6 +1,6 @@
 from flask import Flask, request, render_template
 from api import API
-# from voice_recognition import Voice
+from voice_recognition import Voice
 import sys
 import threading
 import pyperclip
@@ -11,7 +11,7 @@ from PyQt5.QtWidgets import *
 
 APP = Flask(__name__)
 api = API()
-# voice = Voice()
+voice = Voice()
 
 messages = []
 
@@ -52,7 +52,7 @@ def index():
             pyperclip.copy(messages[len(messages) - 1])
 
         if option == "voice":
-           #     user_message = voice.listen()
+            user_message = voice.listen()
             messages.append(f"User: {user_message}")
         elif option == "chat":
             user_message = request.form['user_message']