Merge weirdness removed