China rebel village, government edge towards compromise