git ignore
init
Merge branch 'bla'