Use boolean instead of string value
Merge and fix conflict