failed merge

apparently it doesn't want to let me reset without commiting.
Revert "failed merge"

This reverts commit 3736399a046aa87032acb85b953c9c2857b660d5.
stop being annoying

trying to merge things without muc success.