branched and file added
branching
created file in branch
changes done to try merging
hotfix issue done
changes done to check merging
Merge branch 'test'