fix the confliction