cats: all your rebase are belong to us