fixed wrong merge

fixed wrong merge