remove unneeded if
merge