Fixing merge weirdness