commit before merge with dan