Setting up git
MergingProblem