updated inputs
conflict fixed