merges in disguise

likely more of these to come in future requests @spmurrayzzz