[backend] support merging of .changes file, where the branch fixed an old entry