An efficient line-based approach for resolving merge conflicts in XMI-based models | Publicación