Resolve Conflict Using Github Desktop