something with homepage
fix merge error