remove debug
bootstrap-conversion
fix conflicts in bootstratp merge