merging 2nd of 3 repos