bug fix for fake files
additional code to generate merge confilct with branch t2_branch1
Merge branch 'master' of github.com:tony09uk/working_project

getting error: failed to push... OR hint: Updates were.... etc pulled from remote, merge required
merged with master, conflicts resolve via IDE