home page: user tab
resolve conflict
merge home page