Fixed merge error, ready for comment spinner pull request