Update changelog
Increment build
Fix changelog merge