finish fix merge conflict
top box kind of works; enter works