add git ignore
initial import
resolve conficts