Manual merge of Brush.yaml. Closes #71