Add additional test to justify using a boolean
Fix merge conflict