[sample file added by local dev branch]
fil3 commited from developer
file3 commited from developer
Merge branch 'developer'
test message added to file3
file3 edited and commited from branch dev
merge conflict change