git ignore
all inside
confict resolved