Add details on merging from master to prod