fixed issues with the merge

There were some minor issues with merge conflicts and missing files