Resolve Conflict Using Github On Ubuntu