Get the app running again after merging in master.