4 Commit (MergeProblem1)