super-merge is here!