Follow up merge