Projet netbeans, mouhaha
MERGE CONFLICT composer.lock