AMOR (Adaptable Model Versioning) proposes novel semantic-based methods and techniques to leverage version control in the area of MDE. The innovations of AMOR are manifested in three key research goals. Firstly, AMOR aims at precise conflict detection, i.e. previously undetected as well as wrongly indicated conflicts should be avoided. For this, we incorporate knowledge about the type of modifications the models have undergone and knowledge about the semantics of the modeling concepts used. Secondly, AMOR focuses on an intelligent conflict resolution by providing techniques for the representation of conflicting modifications as well as relieving users from repetitive tasks by suggesting proper resolution strategies. Thirdly, AMOR targets at an adaptable versioning framework, empowering the user to flexibly balance between reasonable adaptation effort and proper versioning support while ensuring generic applicability to various DSLs and associated tools.