second edition
conflict fix