Add calvin button
Edit readme
Resolve conflict