Fix merge conflicts on /spots