almost done
merge
fix commit error