Fix conflicts merge.