merge conflicts with james