Remove on merge bug