This is a second proposed edit to try to get a "merge conflict" to happen
Merge branch 'patch-2' of https://github.com/keflavich/Testing into keflavich-patch-2

Conflicts:
	get_pv_intsmart.pro