Fix batshit crazy merges