homepage conflict for commit - solved