before merge
new folders
resolve conflicts