Bug 16436 borchk check
resolve merge conflicts
check for subdivisions