Merges master in prod