removed pseudo conflict