Added prophetnet mapping to __init__.py and resolved merge issue

optimum/bettertransformer/models/__init__.py

@@ -59,6 +59,7 @@ class BetterTransformerManager:
         "whisper": ("WhisperEncoderLayer", WhisperEncoderLayerBetterTransformer),
         "xlm-roberta": ("XLMRobertaLayer", BertLayerBetterTransformer),
         "yolos": ("YolosLayer", ViTLayerBetterTransformer),
+        "prophetnet": ("ProphetNetEncoderLayer", ProphetNetEncoderLayerBetterTransformer)
     }
 
     EXCLUDE_FROM_TRANSFORM = {

optimum/bettertransformer/models/encoder_models.py

@@ -1117,8 +1117,6 @@ def __init__(self, layer, config):
         )
 
         # Out proj layer
-
-    def forward(self, hidden_states, attention_mask, position_bias=None, *_, **__):
         self.out_proj_weight = layer.self_attn.out_proj.weight
         self.out_proj_bias = layer.self_attn.out_proj.bias