Replaced things that went missing in merge conflicts