Changing file
Merging file after conflict
Merging files
Fix conflict
Correction bug and unit test for shellprogram