Editied the Merge