fix core in /oper caused by somewhat wonky merging