As a side issue, while merging I noticed we now have a new folder and files inside it which I think could be problematic.