Optimised parsing

app.py

@@ -137,13 +137,10 @@ with block:
                 <p>Powered by <a href='https://openai.com/'>OpenAI</a>, <a href='https://arxiv.org/'>arXiv</a> and <a href='https://github.com/hwchase17/langchain'>LangChain 🦜️🔗</a></p>
                 <p>ArxivGPT is a chatbot that answers questions about research papers. It uses a pretrained GPT-3.5 model to generate answers.</p>
                 <p>Currently, it can answer questions about the paper you just linked and can also answer questions about the paper's contents.</p>
-<<<<<<< HEAD
                 <p>It's still in development, so please report any bugs you find.</p>
                 <p>The answers can be quite limited as there is a 4097 token limit for GPT-3.5, hence waiting for GPT-4 access to upgrade.</p>
-=======
                 <p>It's still in development, so please report any bugs you find. It can take up to a minute to start a conversation for every new paper as there is a parsing delay.</p>
                 <p>The answers can be quite limited as there is a 4096 token limit for GPT-3.5, hence waiting for GPT-4 access to upgrade.</p>
->>>>>>> 931a79359c4bcd16e4f5b300b109a873c728ceda
                 <p>Possible upgrades coming up: GPT-4, faster parsing, status messages, other research paper hubs.</p>
             </div>
             <style>