Good catch @koke - I think SourceTree messed up something when I staged individual chunks of changes in separate commits.  Resolved this!