commit from spare from sample
conflict fix