merge before i start today