Some changes
Removal of confliction