Correct the versions of the Files, -> work over the differences between MAster branch and the merge