edit composer
conflict