incorrect merge of AodaacPanel.js