rename file5.txt
delete
chenge
change
create folder
Merge branch 'feature/trial2' into develop

Conflicts:
	file5.txt