link signin to feedpage, fix merge conflict