half way through the checkin button function
fixed merge conflict
fixed conlict