Merge remote-tracking branch 'origin/test-new-branch' into Lien-branch
Delete music file
echo 'Test conflict merge branch.';
Merge remote-tracking branch 'origin/Lien-branch' into test-new-branch
Merge remote-tracking branch 'origin/test-new-branch'