push proof forward
merge changes