I think it does but rerere is not nearly as good as first class conflicts in jj