Random edits, still can't get error to dissapear
committing .xccheckout change
merging with dev
fixing merge conflict