BF: copy paste error in merge!