Update to jiff 0.5.3 for rebase support