Rebuild on post-merge