bundle
added code for responsetips
conflict removed