Add user microposts
fix merge issues