Merge
Merge conflict
Started implementing the retrieval of a definition