- small merge corrections