removed redundant condition
merge