More production changes, conflict merges