added bus text
fixed conflict