generic checkin
merge changes