fix incorrect merge from trunk