purple back to purple
background set as beige
switched to beige to fix conflict
went to earlier commit
added scaffold file back
commit untracked files
fixed merge conflict