Revert "Revert "Revert "merge paper"""

This reverts commit 91a70ca2a2ee61c43d18605de395a94441a922d9.