fixing git diff
Merge branch 'newBranch'