FirstFileBranch new text file added
Modification in Firstfile
Merge conflict fixed