git conflicts in source

[llllllllll]

I tried to build this but there are git conflicts in some readmes and source files, for example: TextAdapter.pyx

[gbrener]

Thanks for opening the issue. You might want to try again now, as PR #4 fixes a lot of build problems.