RE arranged my files and folders again to get a merge to work.