Merge development with production