Revert "Fix the branch conflict"

Reverts passdan/PROMpT#12