Fix conflicts after merge