add settings
resolve confliction