Edited Merged Ipython file