Better description of what's in this repo.
Fix conflict.