Still merging

But now correctly