git ignore
merge
p1-2 works