rebuild after merge