post-rts-merge-cleanup