merge before test