merge with dan