added a comment in BranchTest I am a Conflict branch
added again
Conflicts and merging done