Remove leftover conflict marker
Prepare 0.5.0

Update CHANGELOG, README, add more Yard docs, write the breaking changes
snippet, update the version.