I don't know anymore. What a mess
Merge resolution because dang it