fixing stripe
merge conflicts