merging v2 into main file