conflict fixed?