Resolving wrong merge.

Resolving incorrect merging.