Fix conflicts in composer