Fixed merge conflict weirdness