commit before merge disaster