infovis submission
revision
merge conflicts resolved