finish debug checkin-out
resolve conflict