static data + conflict fix