Bump version
Fix conflict in Changelog