Will changes in testfile1.php reflect change when I switch to master?
Will this resolve the conflict?
Adding remote file
Added file E.
Merge branch 'just_playing'