fix bootstrap
fix findOne method
log icon
resolve merge