added button to listen to phrase in test
resolved conflicts