Revert "Revert "merge paper""

This reverts commit bbef9950069ee43b2d6e450fa3e1ad3e1f8bb0d2.