this is the first commit
this is the second commit
this is the third commit
added new line at end of file
added the fourth line
committing to the test branch
adding different text to master to see if it will create a conflict on merge
this is the commit after fixing conflicts from the merge
stupid commit
committed after merge from github down to local