Updated merge