reenable sidebar merge