forgot bugherd in merge