Chip merging some changes?