conflict fixed