Updated merge class