before jason merge