Fixes merge conflict in outfits index