Made a merge