What is a merge Conflict in Git and how can it be resolved ?