Fixed merge derps and added acronym