Folder add and file move
conflict add
Merge branch 'fix1'