removing confilcts