Non Globe Flow - Reserve
Fix conflict