silence no value
added empty check
fixed conflict