Remove misdirected merge