After a big battle with merging conflicts and a few cloning of the project branch from the start the problems are resolved
I have put comments where there are changed files because I was not able to get to the base of all of the changes so when you look at the files I will remove the comments