Added has function
Fixed conflict