Merging with production version