Fixed Data Feed conflicts