finishing merge with johnny