made a merge conflict in branchOne which i will handle in tortoiseGit
Ready for github.