prepairin for master merge