reverted back to scratch, set up bourbon and neat
fixing merge conflicts