Fixing conflicts (it belongs to the package, not the source)
Updating changelog