Change from location 1
Some changes at location 2
Conficlts solved
Merge branch 'BRANCH_ONE' of https://github.com/jmaralv/git_testing into BRANCH_ONE
Merge branch 'master' of https://github.com/jmaralv/git_testing