Merge branch 'fix-conflicts-with-groups-typo' into 'master'

Fix C&P bug in handling instructions with conflicts_with_groups

See merge request !194