added user posts
added user feed
fixed conficlits