friend page updated
merge issues resolved