Fix conflicts for merge