before james merge