Merging into production