fixed incorrect merge issues