added merging problem how to solve file in UndoGit&MerginProblem