Fix some wierd merge failure in admin app.