here is a secondary addition for #3
Fixing merge issues after #3