checkin modal resolved
after merge