Use === instead of ==
merge conflict fixed