Resolve Conflict Using Github Tutorial