Fixed sidr conflicts