fixing set conflict application