merge with james