Sorted out making folders during save
Resolve conflicts