add initial support for epm conflicts