subm with conflicts too