merged snap changes