... I'm confused.
I don't know why this merge is necessary but I'm too tired to figure it
out