resolved a lot of old merge conflicts that had crashed the functionality of the app.