Revert "conflict"

This reverts commit 1cdf00067e92fa750b2615b6572e52a6cf203395.
Shop edits

shop edits