Android only: Merge 2 versions of an Android Code together, add an Upgrade to Tutor Premium Account Page, and fix a crash

Background 1. Android Application. 2 Existing app code is available. It will be provided. 3 Apps are already live on App Store. 4 Download the apps here: 4A [login to view URL] 4B [login to view URL] 5. Install the app, go through the app What needs to be done: 1 Fix the bug of crashing in the existing Android App. Crashes happen specially on the Registration page after registering, and the Directory page when all teachers are shown and then scrolling down to the bottom of approximately 1000+ tutors, the app will crash. 2. Merge 2 sets of code, Version A and Version B. Version A is the existing code of the live app, Version B is a new set of code that has these pages: "Manage Student Account Page, a Student Registration Page, Edit Student Account Page, and the Pay Tutor for Video Chat, and Pay option for Mins or 30 Mins with Tutor page" Both codes will be provided. 3. At Edit Tutor Account page, Add a button "Upgrade to Tutor Premium Account" at the top on top of the user details. Show this text at the bottom of the button: "One-off lifetime payment. Upgrade to Premium Account to: Be prioritized higher in search results. YOur row will also appear in highlighted colour. " 4B. if button is pressed, bring user to Payment page for paying $50. 4C After user pays, send a receipt to the teacher's email 4D. For the teacher's row in the directory page, when it is shown, please highlight it in light blue and display a "Premium Tutor" icon beside the Tutor's name. Also, prioritize it to appear at the top of the search results. Important: Please make sure that you have seen the Profile pages and Registration pages on the actual app before you actually attempt to ask me any questions on the project. When asking me any questions, I will respond with, "Have you actually seen the Profile page and Registration page on the actual app?" Payment Terms 1. All milestones are only released after the app is fully complete, app is uploaded to the App store. Feedback will be written after programming files are sent over 2. Only an initial milestone of 10% of project value is created at the beginning. This milestone is only released after the first draft is sent over