6S diff rebuild