How To Resolve Conflicts In Github Desktop