Revert "fix merge conflict"

This reverts commit f0864eb568e1cc7025eb94760721484682f33dee, reversing
changes made to a57fd01a37008eb7a6e698f434abb901f4fe3b0c.
Create .travis.yml
Update and rename README to README.md
Update .travis.yml
Update .travis.yml
test
retest
fix crash when remove last TP from condition
Revert "Revert "fix merge conflict""

This reverts commit 4fceb6ce5490adebf88b1ade726a571571b90a74.