Fix conflicts, add mahdi.dependencies