How to resolve a Merge Conflict in GitHub Desktop

>> YOUR LINK HERE: ___ http://youtube.com/watch?v=MIVW0sijSjY




#############################