merge_conflicter fix plugin name