Fix conflicts on merge