Merging Changes by Jimmy