first page commit
fix merge