changelog for conflicts metadata updates