initial commit for plan merge