index
fix conflicts
update install-debian7... .org