created an alert for when the app launches
fixed merge conflicts