Neat and Bourbon installed
Trying to fix merge conflict