Resolving Merge Conflicts How To Use Git And Github Udacity