added a branch and file called new
added a file to the master brach
merged conflict resolved