[docky] fixing changelog after conflict merge