Fix incorrect merge from master