make page under construction
fix merge error