edit home
fix merge issue