Commit 2 with folder1 and file1