adding q
Merge remote-tracking branch 'origin/master' into feature-1
Merge branch 'feature-1'

Conflicts:
	testfile.txt