Fix incorrect merge