How To Resolve Merge Conflicts In Git