Resolve conflicts.
Fixes #57

Update "read up here" link.