Merge settings provider and main activity