Seeing how this is going to merge fred.txt
Commiting a merged file of fred