merge aaronjensen configs