That doesn't work well with conflicts tho iirc