fixed the weird git conflict

erased some work, somehow.  but i think i replaced most of what i lost.