try to fix the model and adding a git attribute to prevent merge of Papyrus files.