vendor/* merge=ours
blocks/build/* merge=ours
readme.txt merge=ours
