Fixing double buffer insertion caused by bad merge