fix merge plugin