StarConflict - fixes #707