Merge with current prod