Merge "Add an ImtConflictTable to better resolve IMT conflicts."
am: 1f4364d

* commit '1f4364d180d231a7d086eb0641deec30f71d02e6':
  Add an ImtConflictTable to better resolve IMT conflicts.