I'm dying here, I don't even know what's going on anymore...
Merge conflicts