/vision_test/ merge=ours
/test/ merge=ours

/.gitattributes merge=ours
/.gitignore merge=ours