fixing incorrect merge