Fix typo in changelog.
Fix tests due to the way conflicts are handled, #214.