adds checkin
fix conflicts