Update app.py

app.py

@@ -2,17 +2,11 @@ import gradio as gr
 import torch
 from transformers import BartForConditionalGeneration, BartTokenizer
 
-<<<<<<< HEAD
 # initialize model + tok variables
 model = None
 tok = None
 
 # pass in Strings of model choice and input text for context
-=======
-model = None
-tok = None
-
->>>>>>> ajs
 def genQuestion(model_choice, context):
     if model_choice=="interview-question-remake":
         model = BartForConditionalGeneration.from_pretrained("hyechanjun/interview-question-remake")