Merge pull request #110 from eric-milles/IVY-813

IVY-813: add typedef for nearest conflict manager