Mandrill issue fixes - return true conflict