new super feature
merge branch foo with conflicts