add -i
master
master
q
bugfix branch
Merge branch 'bugfix'

Conflicts:
	test