merge small changes