we added in all the functionality for the hint buttons
fixed conflicts?
fixed conflicts by deleting file?
merged speech recognition with app