tartans lost in a merge conflict - back widya!

bring tartans, agin