add file1.txt
rename file1.txt
add file3.txt
rename file2.txt
Merge branch 'feature/rename-file' into develop
Merge branch 'develop' into feature/add-file

Conflicts:
Merge branch 'feature/add-file' into develop
Merge branch 'release/release1'