Corrected merge to master error that was causing the app to error when opening in Xcode