homepage conflict to for commit - solved v2