Resolves merge conflicts with main and modifies gsid in settings