add ignore
conflict fix