Merge with John