Fix conflicts that were missed