merging with Arne folder
Merge complete
Post-merge cleanup