Jim's commit with conflicts resolved