fixed incorrect merge