Manually Merging

By hand =(