rebuild solutions after merge