add page substitution
bump version number
cleanup
fix merge conflict