Github ignore
github ignore
conflict github resolve