Working along

Test 2
Changes master branch

Could this result in a conflict?