Merging commits into production